From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Wed, 10 May 2006 15:47:00 +0000 (+0100)
Subject: Simply do not declare module_exit() handlers for netback/blkback, rather
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16047^2~92
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9f124d83346982f9d274c5cdf05185dc65436115;p=xen.git

Simply do not declare module_exit() handlers for netback/blkback, rather
than declaring the modules unsafe.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index 48be015532..ae240a601f 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -571,19 +571,12 @@ static int __init blkif_init(void)
 		list_add_tail(&pending_reqs[i].free_list, &pending_free);
     
 	blkif_xenbus_init();
-	__unsafe(THIS_MODULE);
+
 	return 0;
 }
 
 module_init(blkif_init);
 
-static void blkif_exit(void)
-{
-	BUG();
-}
-
-module_exit(blkif_exit);
-
 MODULE_LICENSE("Dual BSD/GPL");
 
 /*
diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
index b5d3107951..60628ea9b4 100644
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
@@ -849,18 +849,10 @@ static int __init netback_init(void)
 		&netif_be_dbg);
 #endif
 
-	__unsafe(THIS_MODULE);
-
 	return 0;
 }
 
-static void netback_cleanup(void)
-{
-	BUG();
-}
-
 module_init(netback_init);
-module_exit(netback_cleanup);
 
 MODULE_LICENSE("Dual BSD/GPL");